[IA64] bug fix (for SMP-g)

Bug fix for SMP-g: correctly set vcpu_info and map shared_info.
(vcpu_info is set by common code).

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index f4a5850d5251b78c3f401df9be3d30ba05f41a37..11cac65714f88417449bb5d66af8877e90bb1cac 100644 (file)
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -168,7 +168,6 @@ struct vcpu *alloc_vcpu_struct(struct domain *d, unsigned int vcpu_id)
                memset(&d->shared_info->evtchn_mask[0], 0xff,
                    sizeof(d->shared_info->evtchn_mask));
 
-           v->vcpu_info = &(d->shared_info->vcpu_info[0]);
            v->arch.metaphysical_rr0 = d->arch.metaphysical_rr0;
            v->arch.metaphysical_rr4 = d->arch.metaphysical_rr4;
            v->arch.metaphysical_saved_rr0 = d->arch.metaphysical_rr0;

diff --git a/xen/arch/ia64/xen/regionreg.c b/xen/arch/ia64/xen/regionreg.c
index 680377f9f39ce4db0fca9e711523b3ce19301d68..278cf19b023719229dac1b5b502e9b05b015f4f9 100644 (file)
--- a/xen/arch/ia64/xen/regionreg.c
+++ b/xen/arch/ia64/xen/regionreg.c
@@ -258,7 +258,7 @@ int set_one_rr(unsigned long rr, unsigned long val)
                if (!PSCB(v,metaphysical_mode))
                        set_rr(rr,newrrv.rrval);
        } else if (rreg == 7) {
-               ia64_new_rr7(vmMangleRID(newrrv.rrval),v->vcpu_info,
+               ia64_new_rr7(vmMangleRID(newrrv.rrval),v->domain->shared_info,
                             v->arch.privregs, v->domain->arch.shared_info_va,
                             __get_cpu_var(vhpt_paddr));
        } else {